From 09d8592b5bc722cdfe6164929ec2f02943b0379c Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Wed, 4 Aug 2010 12:50:37 +0200 Subject: [PATCH] GtkWidgetPath: Make API more consistent. --- gtk/gtkcssprovider.c | 4 ++-- gtk/gtkwidgetpath.c | 20 ++++++++++---------- gtk/gtkwidgetpath.h | 22 +++++++++++----------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c index f29ca64861..323f397a9c 100644 --- a/gtk/gtkcssprovider.c +++ b/gtk/gtkcssprovider.c @@ -379,7 +379,7 @@ compare_selector_element (GtkWidgetPath *path, { GType type; - type = gtk_widget_path_get_element_type (path, index); + type = gtk_widget_path_iter_get_widget_type (path, index); if (!g_type_is_a (type, elem->type)) return FALSE; @@ -436,7 +436,7 @@ compare_selector_element (GtkWidgetPath *path, const gchar *name, *path_name; name = g_quark_to_string (elem->name); - path_name = gtk_widget_path_get_element_name (path, index); + path_name = gtk_widget_path_iter_get_name (path, index); if (!path_name || strcmp (path_name, name) != 0) diff --git a/gtk/gtkwidgetpath.c b/gtk/gtkwidgetpath.c index bbac2a7af4..60dcfa2371 100644 --- a/gtk/gtkwidgetpath.c +++ b/gtk/gtkwidgetpath.c @@ -132,8 +132,8 @@ gtk_widget_path_prepend_type (GtkWidgetPath *path, } GType -gtk_widget_path_get_element_type (const GtkWidgetPath *path, - guint pos) +gtk_widget_path_iter_get_widget_type (const GtkWidgetPath *path, + guint pos) { GtkPathElement *elem; @@ -145,9 +145,9 @@ gtk_widget_path_get_element_type (const GtkWidgetPath *path, } void -gtk_widget_path_set_element_type (GtkWidgetPath *path, - guint pos, - GType type) +gtk_widget_path_iter_set_widget_type (GtkWidgetPath *path, + guint pos, + GType type) { GtkPathElement *elem; @@ -160,8 +160,8 @@ gtk_widget_path_set_element_type (GtkWidgetPath *path, } G_CONST_RETURN gchar * -gtk_widget_path_get_element_name (const GtkWidgetPath *path, - guint pos) +gtk_widget_path_iter_get_name (const GtkWidgetPath *path, + guint pos) { GtkPathElement *elem; @@ -173,9 +173,9 @@ gtk_widget_path_get_element_name (const GtkWidgetPath *path, } void -gtk_widget_path_set_element_name (GtkWidgetPath *path, - guint pos, - const gchar *name) +gtk_widget_path_iter_set_name (GtkWidgetPath *path, + guint pos, + const gchar *name) { GtkPathElement *elem; diff --git a/gtk/gtkwidgetpath.h b/gtk/gtkwidgetpath.h index b6515e191a..d6e074edec 100644 --- a/gtk/gtkwidgetpath.h +++ b/gtk/gtkwidgetpath.h @@ -38,17 +38,17 @@ guint gtk_widget_path_length (const GtkWidgetPath *path); guint gtk_widget_path_prepend_type (GtkWidgetPath *path, GType type); -GType gtk_widget_path_get_element_type (const GtkWidgetPath*path, - guint pos); -void gtk_widget_path_set_element_type (GtkWidgetPath *path, - guint pos, - GType type); - -G_CONST_RETURN gchar * gtk_widget_path_get_element_name (const GtkWidgetPath *path, - guint pos); -void gtk_widget_path_set_element_name (GtkWidgetPath *path, - guint pos, - const gchar *name); +GType gtk_widget_path_iter_get_widget_type (const GtkWidgetPath *path, + guint pos); +void gtk_widget_path_iter_set_widget_type (GtkWidgetPath *path, + guint pos, + GType type); + +G_CONST_RETURN gchar * gtk_widget_path_iter_get_name (const GtkWidgetPath *path, + guint pos); +void gtk_widget_path_iter_set_name (GtkWidgetPath *path, + guint pos, + const gchar *name); void gtk_widget_path_iter_add_region (GtkWidgetPath *path, guint pos, -- 2.30.2